Add #27 to fixed