Fix Types bug