trying alternative to #2356