#2 fix for dao methods