Mutex attempt for bugfixing