Fix for undefined property error and missing setter