FIX: Fix megsim
Merge pull request #520 from Eric89GXL/megsim-fix

FIX: Fix megsim