Fixing #202 and correcting functionality drag-delay