Upgrade implementation for constant propagation issue