Fixed Error with default values in context