#416, #390 fix