Supply Fixes

Fix #78
Fix #74