Fix from Martin Felke, thanks a lot