BUG FIXED!