Noob bug fix