Update 20180303:
fixes controller issues