Completed #Story18 with this change