Fixing compiler issued due to ordering