One last major bug fix. v0.1.5