Handle static correctly