Reworked and grmlfied patch from Andreas Thienemann