Fixes issues related with #17