fixing #16 (more)