To fix #11

what do you think?