Implemented Kristof's remark.