fixed #549
merged