Fixes Threading