Issue fixed with threads

Signed-off-by: Tyler Messa