Fixed for Shiny 0.9.0 and 0.9.1
Updated for after spring break