I'm not sure I need to do so much, but probably it will work. Fixed #49