attempt at #313