new patch from Remo Hertig added