More fixes
Fixed another regression
Release 2.1.5