#97 Fixed display issue