Portions #28 (Fix)

Portions #28 (Fix)