FIX: issue #589 (Crashing with semicolon placement)