Fix code to behave properly when it is ready to be uncommented