Fixed issue #496
Merge pull request #499 from libavg/fixes/#496

Fixed issue #496