Fix broken 1.5 compatibility