Version 1.2.1: Minor fix to comply with strict standards