Will look into this and revert in a new comment below.