fixed broken control functionality