Fixed Issue #1030
Merge pull request #1063 from diegosarmentero/scheme_refresh

Fixed Issue #1030