Attempt 3 at #391