drag and drop fixed Closes #38