Bug fix (maybe it will have repercusions in future as this was a silent bug)