Temporarly fix for orientation change