Incorporated Nik's fix.