Fixes sortable - work in progress