[PATCH] Fix for bug #12050