fixed issue with update, NON_NONE workaround no longer required