Comment out bug for now