fixed pivotal bugs