test and fix (thx dgp)