Improved deployment support courtesy of @rcgray