Workaround for #17