#1454 proposing alternative solution