Fixed NPN support