Applying fix to #78 Dev Server