Small bug fix for libraries that use this