Fixed bug in Activator implementation