Issue #24 Unexpected end of input fix