Works on 0.3 again