Issue484 fix