Fix this craziness about singleton field