fix from Dimitar Pashev