Fixes #435

Your wish, my command