Reinserted the bug fix of shift + up/down