Package should works correctly now