Small functionality bugfix