bugfixing 1.8 compatible