Fixing ios 8-problem