Updated to reflect bug status