portential fix for ticket #5