issue #13 - model changed