Fix problem with exported functions from previous commit