Fix again for Nirvanix issues