deff fixes #15