Small workaround...