Prevent off-image marks, close #55