Completed #Story27 with this change