Fixed updating behavior (Issue #15)