Fixed issues around previous commit, poorly thought out...

Related Work Items: #128