Fix unbreakable API

Fixed version of #218 , tested by @libraryaddict .