Fixed issue with SystemInfo Controller