Fixed to allow multiple instances