#Fix 27 and #28