Now working correctly