Set up to resolve #143 and #141