Bug fix (option not taken into account)