Fixed typo + change in API from Bertram