fix after rebase - synchronise with old master