Fixes bug #1364939