Another fix to decorator controller