fixed #1. the best I can do