secound fix to #24