Start fixing #24