Address #11 of Issue Tracker