This was something requested by Luigi, he asked me to add this change.