ASTRID: New patch

Bug Fixes