Another fix to be able to merge with master