rest and phing fixing