yet another fix...
(yea, that's what happens when you first use iOS8+, fix there, then fix the rest in iOS7 and break iOS8+ again. They behave differently and thus need different handling)