Adding a workaround for #614