Fix for function definitions