Fix not approved changes of #17