Finally, fixing #7