Work around alignment issues