Fix non-multi-use bug