Fix for MissingPropertyException thrown on startup.