Fixed issues on lines 567 & 451