Fixing #156.