Fixed problem with draggable gaps and state