Add a fix on close