#121 corrected parameter names in guards