fixing issues introduced by the last commit