Code modification attempts to fix issue