Better temp fix for issue #12

- Now locking instead of using some BS bool