Fixed paramter issues