Bug Fix

Hopefully it works