Quick fix for 1.6.6 NPE

Temporary fix