V1.2.x

This is a fix for issue #466