attempt at #476