changed to improve consistency