A small fix for Tommalla/Diaballik