Fixes #280 for 3.0