Partially fixed #3