Fix done after ssaunier review - Thanks! :)