Done #Fix-185 and #Fix-187