Finally fixing the 0.6.3 issue