fixed code for v1.9 and modified a test for the issue
modified the test in the right way
Trac449 passes
Merge pull request #259 from MagLev/dikors/issue204-for-1.9

fixed code for v1.9 and modified a test for the issue