fixing #23