Urgent bugfix for v1.2.4