Fixes #523 on 3.0 branch.