Improved visibility bug