Fixed part of #2, simplified spec