Fix regression bug introduced by 1.8.0
Prepare for 1.8.1 release