Fixes #453.