Fixed display, added check