This really needs to be an option ...