Added fix for the shiny problem.