Fix for issue #158. Works for everything but weight. Is that good enough?