1.2.1 bugfix for issue 3328