Fix bugs related to http://www.geogebra.org/forum/viewtopic.php?f=52&t=36340

git-svn-id: http://dev.geogebra.org/svn/trunk/geogebra@35014 23ce0884-8a58-47d3-bc5c-ddf1cd5b9f9e