fixed #1047
merged with master