Fixed formatting issues on edge case