Fixes ticket:87.