Sigh. Still trying to fix the deadlock issue it seems. This one should do it though