Fix for debug working...