Fixed a bug with na-handling