horrible bug fix B|