Fix #1 again. Now it’s work on create and update.