Fixed constant propagation for the second time :P