Addressed bug on close app