Partially fixed #205