Fixes
Works on 0.10 and 0.11