fixed package, added fix for duplicated messages