Fix to tajaran commit