fixed #534
fixed #528 dixed #534