Fixes DEVELOPER-139 (right rail)