Fixed issue: Remove the extra shift