Read comment about not fixing everything in this ticket. Leave it here