first attempt at #388