workaround for garbage after an end statement
Merge branch 'brokenendfix'