Major bug fixes within the blocking routine