fixed some issue according amo-editors reviews