Minor bug fix related to design change