Fix for undefined property,