fixed function imports