Fixed LP#1324082