Bug in nonMax enhancement fixed