Bug Fixes/Race condition