Bugfix from 0.0.3-alpha > beta