WIP: Removed excessive condition check.