Fixed issue with inconsistent usage