Fixed navigation problems (particularly in lower versions)