Fixed minor issue with 1.7.8 support