Update 2 for the Git Issue #156
This should work properly.