fixed contradictory decls