fixed #12 working