Moving minor bugfix to separate PR