Fixing #135