#24 closing the issue