Fixed 1302 re-occuring bug