Workaround for #126