Fix according to ekohl comments