Issue #133 - Fixing persisting Issues