Silly bugfix and consistency