Hopefully fixed the bug for niffiwan now.