Small workaround