Editable fix
Fix not working
Fixed
Merge branch 'editable_fix'
Because I want it :P