Fix to Module Extract