Workaround for #13