Fix for making old version work