Debug bug fix
Test build