refacto - fix #4