bug fix for daniel :-)