Tweaking PR #145