fixed #206. will need to address #200 with the JS