possibly fixed #2