fixes #185 partially