attempt to clean up controller issue