#528 fix