Hopefully fixed Nina bug