fixing some inconsistences