patch from Dev1