no real changes committed
bug fix after talking to Rony