Second iteration fixes #12