[Update] - bugfix after merging.