Fixed duplicate #current