Fix *another* data overwrite bug