Closes issue #1334