Fixing #192