Solved Base generation issue. Fixes #1