This has been bothering me for awhile. Thanks for this fix until we have some official solution (if ever).