Fix for accidently removed patch in one of @MMeent 's commits