closes #1334