Fixing merge error on 0.4.1