Small tweak to make sure that it all works.