Bug/09847 change syntax