Fixes #75 - observer issue