Issue #23

Fixed for the main simulation