Changed mapping for closing buffer