Fixing major bug in last release