#21 Bugfix: filename was ambiguous