#143: Fixing mistakes made on merge