Fix for prevent display errors