Solves a bug derived of the last change.