FastshareCz: Fixed #521
Merged #529