singleton - possibly found bug