Fixed #483

Couldn't fix #434 , LoopsAndConditions.cs is a huge mess.