fix to suit functions were changed to defsubst