fixes issues caused by dbw#104