fixed bug at 1334