some fixes to naive