Reproducing the #216
Refactor: extract initializer function name
Fix for #216
New bug test case
New fix
Dead code removal
Merge pull request #217 from jponge/bug/216

Fix for #216