#278 fix again