efficient way to fix #20