Correctly handle STATIC