Workaround for #24