Fix for Z-Order issues.