Fixed but still needs improvement