Restored workaround for 1.4