Fixed GUI issue