Partial fix for #3927 

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

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