Bug Fix on controllers