fixing problem with commit e63b