Fix for https://github.com/uoa-group-applications/soaunit/issues/16