amorellgarcia 
This piece of code was removed for kepler and then brought back in because juno failed.
Before I accept your pull request I want to be sure this works in juno and kepler (and I still need to find out how I can easily test a pull request)