fix bug - we need to test for this