third time fixing bugs from pull