Made temporary hack a little more portable.