Fixing #123 and #122.