Bugfix + packaging