Removed major bug in framework.