Fixes #1334