Hot-fix release 1.2.1 to fix #70