I think it's the simplest solution. +1 for this. @wronk can you take care
of this?