Workaround for double cast issue closes #1456