Ok ok, fix the last bug properly

Also bump to 0.1.5