Fixes after rochan CR 28.08.2014