Fixed PR 1c