Fix for nami