Pull request for Dehven's Issue