I think this is the right way to do this :) fixes #7