temp fix for controller