Fixed NPE sources