Revert "Revert "Fixed incorrect merge""

This reverts commit 9d1913f87ce2e39c9ac9c87ccab43984c925b22c.