Fix responiveness