major bug fix. please update.