Fixed Issues with Capitalisation