#4289 Fixed

git-svn-id: http://dev.geogebra.org/svn/trunk/geogebra@33745 23ce0884-8a58-47d3-bc5c-ddf1cd5b9f9e
Fix for #4307, part of #4156

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