fixed issue 1336 again