Issue #122. Refactored the forward logic.