Apply patch from craigberry

fixes #468
Version Bump: Alpha 068