Fixed; (part of the bug only tho)