Start fixing issue #30