Improved handling of GO TO command