bug fix for double click save behaviour.