fixed issue #30, felling productive :D