polished a bit before 0.7.3