Bugfix for certain 1.8 versions