Fixed a possible bug, found another...