Issue controller fix