UPDATE: Fix minor bug on save