Close #3 issue

This should probably work