Fix 114 and Fix112