Patch 8.0

Fixed broken logic