fix the bug that both @mattbasta and @spasovski could not figure out