Straight mode bug fix: issue with pull 31