fixed #defines