Small Fix

Inelegant, need better solution