It works correctly but has UI issue with layout