Fixing Bugs https://issuetracker02.eggits.net/browse/ODB-26 and https://issuetracker02.eggits.net/browse/ODB-25