First attempt at addressing issue 44