Small Impl Fix