Deadlock #SCL-5858 Fixed