Issue #15 (hard-coded) removed