fixed #155
fixed #156
obsolete