Error temporary fixed, need permanent solution