Fix for bug #3230

This is simple and effecient solution for that problem.